From 96982347b3e03c921a3d65de0e715bc5fb221e20 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 8 Apr 2013 22:28:43 -0400 Subject: [PATCH] wayland: Clean up gdkwayland.h Make this an include-only header --- gdk/wayland/Makefile.am | 2 + gdk/wayland/gdkwayland.h | 48 ++---------------- gdk/wayland/gdkwaylanddisplaymanager.h | 50 +++++++++++++++++++ gdk/wayland/gdkwaylandselection.h | 69 ++++++++++++++++++++++++++ 4 files changed, 124 insertions(+), 45 deletions(-) create mode 100644 gdk/wayland/gdkwaylanddisplaymanager.h create mode 100644 gdk/wayland/gdkwaylandselection.h diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am index 824ab9a7e5..4e3b83f0b4 100644 --- a/gdk/wayland/Makefile.am +++ b/gdk/wayland/Makefile.am @@ -40,6 +40,8 @@ libgdkinclude_HEADERS = \ libgdkwaylandinclude_HEADERS = \ gdkwaylanddevice.h \ gdkwaylanddisplay.h \ + gdkwaylanddisplaymanager.h \ + gdkwaylandselection.h \ gdkwaylandwindow.h -include $(top_srcdir)/git.mk diff --git a/gdk/wayland/gdkwayland.h b/gdk/wayland/gdkwayland.h index da636710e7..fa08735811 100644 --- a/gdk/wayland/gdkwayland.h +++ b/gdk/wayland/gdkwayland.h @@ -31,52 +31,10 @@ #include #include +#include +#include #include -G_BEGIN_DECLS - -typedef struct _GdkWaylandDisplayManager GdkWaylandDisplayManager; -typedef struct _GdkWaylandDisplayManagerClass GdkWaylandDisplayManagerClass; - -#define GDK_TYPE_WAYLAND_DISPLAY_MANAGER (gdk_wayland_display_manager_get_type()) -#define GDK_WAYLAND_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManager)) -#define GDK_WAYLAND_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass)) -#define GDK_IS_WAYLAND_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER)) -#define GDK_IS_WAYLAND_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER)) -#define GDK_WAYLAND_DISPLAY_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass)) - -GType gdk_wayland_display_manager_get_type (void); - -#if defined (GTK_COMPILATION) || defined (GDK_COMPILATION) -#define gdk_wayland_device_get_selection_type_atoms gdk_wayland_device_get_selection_type_atoms_libgtk_only -int -gdk_wayland_device_get_selection_type_atoms (GdkDevice *device, - GdkAtom **atoms_out); - -typedef void (*GdkDeviceWaylandRequestContentCallback) (GdkDevice *device, const gchar *data, gsize len, gpointer userdata); - -#define gdk_wayland_device_request_selection_content gdk_wayland_device_request_selection_content_libgtk_only -gboolean -gdk_wayland_device_request_selection_content (GdkDevice *device, - const gchar *requested_mime_type, - GdkDeviceWaylandRequestContentCallback cb, - gpointer userdata); - -typedef gchar *(*GdkDeviceWaylandOfferContentCallback) (GdkDevice *device, const gchar *mime_type, gssize *len, gpointer userdata); - -#define gdk_wayland_device_offer_selection_content gdk_wayland_device_offer_selection_content_libgtk_only -gboolean -gdk_wayland_device_offer_selection_content (GdkDevice *gdk_device, - const gchar **mime_types, - gint nr_mime_types, - GdkDeviceWaylandOfferContentCallback cb, - gpointer userdata); - -#define gdk_wayland_device_clear_selection_content gdk_wayland_device_clear_selection_content_libgtk_only -gboolean -gdk_wayland_device_clear_selection_content (GdkDevice *gdk_device); - -#endif -G_END_DECLS +#undef __GDKWAYLAND_H_INSIDE__ #endif /* __GDK_WAYLAND_H__ */ diff --git a/gdk/wayland/gdkwaylanddisplaymanager.h b/gdk/wayland/gdkwaylanddisplaymanager.h new file mode 100644 index 0000000000..1910c965df --- /dev/null +++ b/gdk/wayland/gdkwaylanddisplaymanager.h @@ -0,0 +1,50 @@ +/* GDK - The GIMP Drawing Kit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GTK+ Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + */ + +#ifndef __GDK_WAYLAND_DISPLAY_MANAGER_H__ +#define __GDK_WAYLAND_DISPLAY_MANAGER_H__ + +#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION) +#error "Only can be included directly." +#endif + +#include + +G_BEGIN_DECLS + +typedef struct _GdkWaylandDisplayManager GdkWaylandDisplayManager; +typedef struct _GdkWaylandDisplayManagerClass GdkWaylandDisplayManagerClass; + +#define GDK_TYPE_WAYLAND_DISPLAY_MANAGER (gdk_wayland_display_manager_get_type()) +#define GDK_WAYLAND_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManager)) +#define GDK_WAYLAND_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass)) +#define GDK_IS_WAYLAND_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER)) +#define GDK_IS_WAYLAND_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER)) +#define GDK_WAYLAND_DISPLAY_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass)) + +GType gdk_wayland_display_manager_get_type (void); + +G_END_DECLS + +#endif /* __GDK_WAYLAND_DISPLAY_MANAGER_H__ */ diff --git a/gdk/wayland/gdkwaylandselection.h b/gdk/wayland/gdkwaylandselection.h new file mode 100644 index 0000000000..ab96db13c9 --- /dev/null +++ b/gdk/wayland/gdkwaylandselection.h @@ -0,0 +1,69 @@ +/* GDK - The GIMP Drawing Kit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GTK+ Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + */ + +#ifndef __GDK_WAYLAND_SELECTION_H__ +#define __GDK_WAYLAND_SELECTION_H__ + +#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION) +#error "Only can be included directly." +#endif + +#include + +G_BEGIN_DECLS + +#if defined (GTK_COMPILATION) || defined (GDK_COMPILATION) +#define gdk_wayland_device_get_selection_type_atoms gdk_wayland_device_get_selection_type_atoms_libgtk_only +int +gdk_wayland_device_get_selection_type_atoms (GdkDevice *device, + GdkAtom **atoms_out); + +typedef void (*GdkDeviceWaylandRequestContentCallback) (GdkDevice *device, const gchar *data, gsize len, gpointer userdata); + +#define gdk_wayland_device_request_selection_content gdk_wayland_device_request_selection_content_libgtk_only +gboolean +gdk_wayland_device_request_selection_content (GdkDevice *device, + const gchar *requested_mime_type, + GdkDeviceWaylandRequestContentCallback cb, + gpointer userdata); + +typedef gchar *(*GdkDeviceWaylandOfferContentCallback) (GdkDevice *device, const gchar *mime_type, gssize *len, gpointer userdata); + +#define gdk_wayland_device_offer_selection_content gdk_wayland_device_offer_selection_content_libgtk_only +gboolean +gdk_wayland_device_offer_selection_content (GdkDevice *gdk_device, + const gchar **mime_types, + gint nr_mime_types, + GdkDeviceWaylandOfferContentCallback cb, + gpointer userdata); + +#define gdk_wayland_device_clear_selection_content gdk_wayland_device_clear_selection_content_libgtk_only +gboolean +gdk_wayland_device_clear_selection_content (GdkDevice *gdk_device); + +#endif + +G_END_DECLS + +#endif /* __GDK_WAYLAND_SELECTION_H__ */ -- 2.30.2